Delay resolving dynamic DNS tunnels during boot

This commit is contained in:
Seth Mos 2011-02-11 09:28:11 +01:00
parent 1d56414377
commit d610946897

View File

@ -1677,8 +1677,13 @@ function reload_tunnel_spd_policy($phase1, $phase2, $old_phase1, $old_phase2) {
/* see if this tunnel has a hostname for the remote-gateway, and if so,
* try to resolve it now and add it to the list for filterdns */
if (!is_ipaddr($phase1['remote-gateway'])) {
$rgip = resolve_retry($phase1['remote-gateway']);
add_hostname_to_watch($phase1['remote-gateway']);
if(! $g['booting']) {
$rgip = resolve_retry($phase1['remote-gateway']);
add_hostname_to_watch($phase1['remote-gateway']);
return false;
} else {
add_hostname_to_watch($phase1['remote-gateway']);
}
if (!$rgip) {
log_error("Could not determine VPN endpoint for '{$phase1['descr']}'");
return false;