lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Routing, gateways. move return_gateways_array() out of the way in DHCPvX relay services and prevent gatewaysIndexedByName() to be called multiple times in the loop, for https://github.com/opnsense/core/issues/2279

Browse Source
This commit is contained in:
Ad Schellevis 2019-04-12 12:07:02 +02:00
parent 4494f5cf24
commit 45c01a61ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/services.inc
View File

@ -1493,6 +1493,7 @@ function services_dhcrelay_configure($verbose = false)
}
$iflist = get_configured_interface_with_descr();
$a_gateways = (new \OPNsense\Routing\Gateways(legacy_interfaces_details()))->gatewaysIndexedByName(true);
$dhcifaces = explode(",", $dhcrelaycfg['interface']);
foreach ($dhcifaces as $dhcrelayif) {
if (!isset($iflist[$dhcrelayif]) || link_interface_to_bridge($dhcrelayif)) {
@ -1527,7 +1528,6 @@ function services_dhcrelay_configure($verbose = false)
if (!isset($destif)) {
foreach (get_staticroutes() as $rtent) {
if (ip_in_subnet($srvip, $rtent['network'])) {
$a_gateways = return_gateways_array(true);
$destif = $a_gateways[$rtent['gateway']]['interface'];
break;
}
@ -1613,6 +1613,7 @@ function services_dhcrelay6_configure($verbose = false)
}
$iflist = get_configured_interface_with_descr();
$a_gateways = (new \OPNsense\Routing\Gateways(legacy_interfaces_details()))->gatewaysIndexedByName(true);
$dhcifaces = explode(",", $dhcrelaycfg['interface']);
foreach ($dhcifaces as $dhcrelayif) {
if (!isset($iflist[$dhcrelayif]) || link_interface_to_bridge($dhcrelayif)) {
@ -1651,7 +1652,6 @@ function services_dhcrelay6_configure($verbose = false)
if (isset($config['staticroutes']['route'])) {
foreach ($config['staticroutes']['route'] as $rtent) {
if (ip_in_subnet($srvip, $rtent['network'])) {
$a_gateways = return_gateways_array(true);
$destif = $a_gateways[$rtent['gateway']]['interface'];
break;
}