Project

General

Profile

Regression #11475 » 169.diff

Viktor Gurov, 03/02/2021 06:57 AM

View differences:

etc/inc/captiveportal.inc
2195 2195
		}
2196 2196
	}
2197 2197

  
2198
	$route = route_get($cliip);
2198
	$route = route_get($cliip, 'inet', true);
2199 2199
	if (empty($route)) {
2200 2200
		return false;
2201 2201
	}
etc/inc/util.inc
2685 2685
			}
2686 2686
		} else {
2687 2687
			$gateway = exec("/sbin/route -n{$inet} get {$target} | /usr/bin/awk '/gateway:/{print $2}'");
2688
			if (!$gateway) {
2689
				// non-local gateway
2690
				$gateway = get_interface_mac($interface);
2691
			}
2688 2692
		}
2689 2693
		$result[] = array('gateway' => $gateway, 'interface-name' => $interface);
2690 2694
	} else {
......
2738 2742
		return false;
2739 2743
	}
2740 2744

  
2741
	$route = route_get($target, $ipprotocol);
2745
	$route = route_get($target, $ipprotocol, true);
2742 2746

  
2743 2747
	if (empty($route)) {
2744 2748
		return;
usr/local/www/system_routes_edit.php
200 200
					if (is_ipaddrv6($dts)) {
201 201
						$family = "-inet6";
202 202
					}
203
					$route = route_get($dts);
203
					$route = route_get($dts, '', true);
204 204
					if (!count($route)) {
205 205
						continue;
206 206
					}
(2-2/2)