diff options
| author | jim-p <jimp@netgate.com> | 2018-11-14 08:53:37 -0500 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-12-11 09:43:30 -0500 |
| commit | 89a746a94db291cd006e5a615c393e034e145990 (patch) | |
| tree | 75b5a46f763dc76dd1f10b9ff2c7e9d9e1874d31 /src/etc/inc/services.inc | |
| parent | f8ce2bd498fcd4a2c685a59c0da7394ac684ed55 (diff) | |
| download | pfsense-89a746a94db291cd006e5a615c393e034e145990.zip pfsense-89a746a94db291cd006e5a615c393e034e145990.tar.gz | |
Remove obsolete OLSRD code. Implements #9117
(cherry picked from commit 592bec817f152a7536572a675079776138827cc8)
Diffstat (limited to 'src/etc/inc/services.inc')
| -rw-r--r-- | src/etc/inc/services.inc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index e4b70df..d9f4601 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -479,19 +479,6 @@ function services_dhcpdv4_configure() { return 0; } - /* if OLSRD is enabled, allow WAN to house DHCP. */ - if (!function_exists('is_package_installed')) { - require_once('pkg-utils.inc'); - } - if (is_package_installed('olsrd') && isset($config['installedpackages']['olsrd'])) { - foreach ($config['installedpackages']['olsrd']['config'] as $olsrd) { - if (isset($olsrd['enable']) && $olsrd['enable'] == "on") { - $is_olsr_enabled = true; - break; - } - } - } - $syscfg = $config['system']; if (!is_array($config['dhcpd'])) { $config['dhcpd'] = array(); @@ -672,12 +659,6 @@ EOPP; continue; } - if ($is_olsr_enabled == true) { - if ($dhcpifconf['netmask']) { - $subnetmask = gen_subnet_mask($dhcpifconf['netmask']); - } - } - $all_pools = array(); $all_pools[] = $dhcpifconf; if (is_array($dhcpifconf['pool'])) { @@ -1407,12 +1388,6 @@ EOD; // of each subnet here is always /64. $pdlen = 64; - if ($is_olsr_enabled == true) { - if ($dhcpv6ifconf['netmask']) { - $subnetmask = gen_subnet_maskv6($dhcpv6ifconf['netmask']); - } - } - $dnscfgv6 = ""; if ($dhcpv6ifconf['domain']) { |
