dhcp: returning a "real" device only works if an address is attached

We could remove the change to the primary function but perhaps we will
need it later.  It doesn't hurt either way.
This commit is contained in:
Franco Fichtner 2023-07-26 10:02:33 +02:00
parent 9184457ab8
commit ace962a6ff

View File

@ -715,9 +715,10 @@ EOPP;
continue;
}
list ($ifcfgip, $ifcfgnet, $ifcfgsn, $ifcfgdev) = interfaces_primary_address($dhcpif, $ifconfig_details);
list ($ifcfgip, $ifcfgnet, $ifcfgsn) = interfaces_primary_address($dhcpif, $ifconfig_details);
if (!is_ipaddrv4($ifcfgip) || !is_subnetv4($ifcfgnet)) {
log_msg("dhcpd_dhcp4_configure() found no suitable IPv4 address on {$dhcpif}(${ifcfgdev})", LOG_WARNING);
$realif = get_real_interface($dhcpif);
log_msg("dhcpd_dhcp4_configure() found no suitable IPv4 address on {$dhcpif}({$realif})", LOG_WARNING);
continue;
}
@ -1440,9 +1441,10 @@ EOD;
continue;
}
list ($ifcfgipv6, $networkv6, $unused, $ifcfgdevv6) = interfaces_primary_address6($dhcpv6if, $ifconfig_details);
list ($ifcfgipv6, $networkv6) = interfaces_primary_address6($dhcpv6if, $ifconfig_details);
if (!is_ipaddrv6($ifcfgipv6) || !is_subnetv6($networkv6)) {
log_msg("dhcpd_dhcp6_configure() found no suitable IPv6 address on {$dhcpv6if}({$ifcfgdevv6})", LOG_WARNING);
$realif = get_real_interface($dhcpv6if);
log_msg("dhcpd_dhcp6_configure() found no suitable IPv6 address on {$dhcpv6if}({$realif})", LOG_WARNING);
continue;
}