diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-07-09 18:39:38 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-07-09 18:40:06 -0500 |
| commit | c3099b79d30ca8b9c34b77a6d96cd270f6101c7b (patch) | |
| tree | 76ac4ff94ba76396839341ae8fe589ee24c390ac /src/etc | |
| parent | f54953075e9493542bd7557885d8c49dbe87d300 (diff) | |
| download | pfsense-c3099b79d30ca8b9c34b77a6d96cd270f6101c7b.zip pfsense-c3099b79d30ca8b9c34b77a6d96cd270f6101c7b.tar.gz | |
Add configuration for Min and MaxRtrAdvInterval. Ticket #6533
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/services.inc | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 0848ea5..88ddcca 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -143,8 +143,19 @@ function services_radvd_configure($blacklist = array()) { $radvdconf .= "\tUnicastOnly on;\n"; } $radvdconf .= "\tAdvSendAdvert on;\n"; - $radvdconf .= "\tMinRtrAdvInterval 5;\n"; - $radvdconf .= "\tMaxRtrAdvInterval 20;\n"; + + if (is_numericint($dhcpv6ifconf['raminrtradvinterval'])) { + $radvdconf .= "\tMinRtrAdvInterval {$dhcpv6ifconf['raminrtradvinterval']};\n"; + } else { + $radvdconf .= "\tMinRtrAdvInterval 5;\n"; + } + + if (is_numericint($dhcpv6ifconf['ramaxrtradvinterval'])) { + $radvdconf .= "\tMaxRtrAdvInterval {$dhcpv6ifconf['ramaxrtradvinterval']};\n"; + } else { + $radvdconf .= "\tMaxRtrAdvInterval 20;\n"; + } + $mtu = get_interface_mtu($realif); if (is_numeric($mtu)) { $radvdconf .= "\tAdvLinkMTU {$mtu};\n"; @@ -337,8 +348,16 @@ function services_radvd_configure($blacklist = array()) { $radvdconf .= "# Generated config for {$autotype} delegation from {$trackif} on {$if}\n"; $radvdconf .= "interface {$realif} {\n"; $radvdconf .= "\tAdvSendAdvert on;\n"; - $radvdconf .= "\tMinRtrAdvInterval 3;\n"; - $radvdconf .= "\tMaxRtrAdvInterval 10;\n"; + if (is_numericint($dhcpv6ifconf['raminrtradvinterval'])) { + $radvdconf .= "\tMinRtrAdvInterval {$dhcpv6ifconf['raminrtradvinterval']};\n"; + } else { + $radvdconf .= "\tMinRtrAdvInterval 5;\n"; + } + if (is_numericint($dhcpv6ifconf['ramaxrtradvinterval'])) { + $radvdconf .= "\tMaxRtrAdvInterval {$dhcpv6ifconf['ramaxrtradvinterval']};\n"; + } else { + $radvdconf .= "\tMaxRtrAdvInterval 10;\n"; + } $mtu = get_interface_mtu($realif); if (is_numeric($mtu)) { $radvdconf .= "\tAdvLinkMTU {$mtu};\n"; |
