opensourcemirror
/
opnsense-core
mirror of https://github.com/opnsense/core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

interfaces: match IPv6 equivalent 

find_interface_ip() is more prone to side effects and
get_interface_ip() is the fallback anyway.
This commit is contained in:
Franco Fichtner 2020-05-11 04:26:50 +02:00
parent 8cfcbbe891
commit 6529ef77ef
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/etc/rc.newwanip
View File

@ -50,16 +50,13 @@ log_error("IPv4 renewal is starting on '{$argument}'");
if (empty($argument)) {
$interface = 'wan';
$interface_real = get_real_interface($interface);
$ip = get_interface_ip($interface);
} else {
$interface = convert_real_interface_to_friendly_interface_name($argument);
$interface_real = $argument;
$ip = find_interface_ip($interface_real);
if (empty($ip)) {
$ip = get_interface_ip($interface);
}
}
$ip = get_interface_ip($interface);
if (!isset($config['interfaces'][$interface]['enable'])) {
log_error("Interface '{$interface}' is disabled or empty, nothing to do.");
return;