diff options
| author | smos <seth.mos@dds.nl> | 2012-06-07 13:46:42 +0200 |
|---|---|---|
| committer | smos <seth.mos@dds.nl> | 2012-06-07 13:46:42 +0200 |
| commit | 8859c0a69b49553d92314d5e131dcdcf134d631f (patch) | |
| tree | ba69511ef1a7f52e7679906553cbe9e63730fea6 /etc | |
| parent | 738dfac400c8fa4a0d79825dafa20e9976fd4b66 (diff) | |
| download | pfsense-8859c0a69b49553d92314d5e131dcdcf134d631f.zip pfsense-8859c0a69b49553d92314d5e131dcdcf134d631f.tar.gz | |
Correct the syntax, the RemoveRoute needs to end up in route statement
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/services.inc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index d8e433c..973f5a6 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -116,8 +116,8 @@ function services_radvd_configure() { $radvdconf .= "# Generated for DHCPv6 Server $dhcpv6if\n"; $radvdconf .= "interface {$realif} {\n"; $radvdconf .= "\tAdvSendAdvert on;\n"; - $radvdconf .= "\tMinRtrAdvInterval 3;\n"; - $radvdconf .= "\tMaxRtrAdvInterval 10;\n"; + $radvdconf .= "\tMinRtrAdvInterval 5;\n"; + $radvdconf .= "\tMaxRtrAdvInterval 20;\n"; $radvdconf .= "\tAdvLinkMTU 1280;\n"; // $radvdconf .= "\tDeprecatePrefix on;\n"; switch($dhcpv6ifconf['rapriority']) { @@ -142,10 +142,8 @@ function services_radvd_configure() { $radvdconf .= "\tprefix {$subnetv6}/{$ifcfgsnv6} {\n"; if($carpif == true) { $radvdconf .= "\t\tDeprecatePrefix off;\n"; - $radvdconf .= "\t\tRemoveRoute off;\n"; } else { $radvdconf .= "\t\tDeprecatePrefix on;\n"; - $radvdconf .= "\t\tRemoveRoute off;\n"; } switch($dhcpv6ifconf['ramode']) { case "managed": @@ -171,6 +169,16 @@ function services_radvd_configure() { } $radvdconf .= "\t};\n"; + if($carpif == true) { + $radvdconf .= "\troute {$subnetv6}/{$ifcfgsnv6} {\n"; + $radvdconf .= "\t\tRemoveRoute off;\n"; + $radvdconf .= "\t};\n"; + } else { + $radvdconf .= "\troute {$subnetv6}/{$ifcfgsnv6} {\n"; + $radvdconf .= "\t\tRemoveRoute off;\n"; + $radvdconf .= "\t};\n"; + } + /* add DNS servers */ $dnslist = array(); if(!empty($dhcpv6ifconf['dnsserver'][0])) { |
