Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
089a3f07
Commit
089a3f07
authored
Oct 25, 2016
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for
https://github.com/opnsense/core/issues/1196
parent
6aac623b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
services.inc
src/etc/inc/services.inc
+4
-1
services_router_advertisements.php
src/www/services_router_advertisements.php
+1
-1
No files found.
src/etc/inc/services.inc
View file @
089a3f07
...
@@ -109,8 +109,11 @@ function services_radvd_configure($blacklist = array())
...
@@ -109,8 +109,11 @@ function services_radvd_configure($blacklist = array())
/* check if we need to listen on a CARP interface */
/* check if we need to listen on a CARP interface */
$realif
=
get_real_interface
(
$dhcpv6if
,
"inet6"
);
$realif
=
get_real_interface
(
$dhcpv6if
,
"inet6"
);
if
(
!
empty
(
$dhcpv6ifconf
[
'rainterface'
]))
{
if
(
!
empty
(
$dhcpv6ifconf
[
'rainterface'
])
&&
$dhcpv6ifconf
[
'rainterface'
]
!=
'interface'
)
{
$dhcpv6if
=
$dhcpv6ifconf
[
'rainterface'
];
$dhcpv6if
=
$dhcpv6ifconf
[
'rainterface'
];
}
elseif
(
!
empty
(
$dhcpv6ifconf
[
'rainterface'
]))
{
// backward compatibilty mode, unset invalid options
unset
(
$dhcpv6ifconf
[
'rainterface'
]);
}
}
$ifcfgipv6
=
get_interface_ipv6
(
$dhcpv6if
);
$ifcfgipv6
=
get_interface_ipv6
(
$dhcpv6if
);
...
...
src/www/services_router_advertisements.php
View file @
089a3f07
...
@@ -257,9 +257,9 @@ include("head.inc");
...
@@ -257,9 +257,9 @@ include("head.inc");
<
td
><
a
id
=
"help_for_rainterface"
href
=
"#"
class
="
showhelp
"><i class="
fa
fa
-
info
-
circle
"></i></a> <?=gettext("
RA
Interface
");?></td>
<
td
><
a
id
=
"help_for_rainterface"
href
=
"#"
class
="
showhelp
"><i class="
fa
fa
-
info
-
circle
"></i></a> <?=gettext("
RA
Interface
");?></td>
<td>
<td>
<select name="
rainterface
" id="
rainterface
">
<select name="
rainterface
" id="
rainterface
">
<option value="" <?=empty(
$pconfig['rainterface']
) ? "
selected
=
\
"selected
\"
"
:
""
;
?>
>
<?=
strtoupper
(
$if
);
?>
</option>
<?php
<?php
foreach
(
$carplistif
as
$ifname
=>
$vip
)
:
?>
foreach
(
$carplistif
as
$ifname
=>
$vip
)
:
?>
<option value="
interface
" <?php if (
$pconfig['rainterface']
== "
interface
") echo "
selected
=
\
"selected
\"
"
;
?>
>
<?=
strtoupper
(
$if
);
?>
</option>
<option
value=
"
<?=
$ifname
?>
"
<?php
if
(
$pconfig
[
'rainterface'
]
==
$ifname
)
echo
"selected=
\"
selected
\"
"
;
?>
>
<?=
"
$ifname
-
$vip
"
;
?>
</option>
<option
value=
"
<?=
$ifname
?>
"
<?php
if
(
$pconfig
[
'rainterface'
]
==
$ifname
)
echo
"selected=
\"
selected
\"
"
;
?>
>
<?=
"
$ifname
-
$vip
"
;
?>
</option>
<?php
<?php
endforeach
;
?>
endforeach
;
?>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment