diff options
| author | PiBa-NL <pba_2k3@yahoo.com> | 2018-03-04 16:46:39 +0100 |
|---|---|---|
| committer | PiBa-NL <pba_2k3@yahoo.com> | 2018-03-04 16:49:15 +0100 |
| commit | 6b3e3bc51dd56e4d852d5041d62ae6e45b77de6c (patch) | |
| tree | f00cc5743a29cb28356009e714a2d9ea9ce2eea5 /src/etc | |
| parent | 58a2ba621c390362170aa2e377e4b41c8fdce1c6 (diff) | |
| download | pfsense-6b3e3bc51dd56e4d852d5041d62ae6e45b77de6c.zip pfsense-6b3e3bc51dd56e4d852d5041d62ae6e45b77de6c.tar.gz | |
igmp, Add option to disable the igmp service
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/services.inc | 3 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index f3b0666..29e4481 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -1667,6 +1667,9 @@ function services_igmpproxy_configure() { /* kill any running igmpproxy */ killbyname("igmpproxy"); + if (!isset($config['igmpproxy']['enabled'])) { + return 0; + } if (!is_array($config['igmpproxy']['igmpentry']) || (count($config['igmpproxy']['igmpentry']) == 0)) { return 1; } diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index d8bae8e..bc9c72d 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -5509,4 +5509,16 @@ function upgrade_174_to_175() { } } } + +/* igmp always was enabled by default if settings were present. + * So enable it once on upgrade if settings are there. + * And provide the option through gui to disable it again + */ +function upgrade_175_to_176() { + global $config; + if (is_array($config['igmpproxy']['igmpentry']) && (count($config['igmpproxy']['igmpentry']) > 0)) { + $config['igmpproxy']['enabled'] = true; + } +} + ?> |
