From: Andrew Cagney <cagney@gnu.org>
Date: Fri, 19 Dec 2025 04:02:38 +0000 (-0500)
Subject: resolve: move defaultroute call out of helper
X-Git-Url: https://git.feebdaed.xyz/?a=commitdiff_plain;h=79e779d6a76fb5b1a7799ff1e590c440dcaa4768;p=0xmirror%2Flibreswan.git

resolve: move defaultroute call out of helper
---

diff --git a/programs/pluto/resolve_helper.c b/programs/pluto/resolve_helper.c
index 14aedc86f2..08ac26a76b 100644
--- a/programs/pluto/resolve_helper.c
+++ b/programs/pluto/resolve_helper.c
@@ -93,17 +93,6 @@ static struct host_addrs resolve_extracted_host_addrs(const struct host_addrs *h
 		end->host.addr = host_addr;
 	}
 
-	if (!resolved.needs.dns) {
-		resolve_default_route(&resolved.end[LEFT_END],
-				      &resolved.end[RIGHT_END],
-				      host_addrs->afi,
-				      verbose);
-		resolve_default_route(&resolved.end[RIGHT_END],
-				      &resolved.end[LEFT_END],
-				      host_addrs->afi,
-				      verbose);
-	}
-
 	return resolved;
 }
 
@@ -120,12 +109,23 @@ void resolve_continue(struct help_request *request,
 		      struct verbose verbose)
 {
 	struct connection *c = request->connection;
-	const struct host_addrs *resolved = &request->resolved_host_addrs;
+	struct host_addrs *resolved = &request->resolved_host_addrs;
 
 	vdbg("needs.dns = %s needs.route = %s",
 	     bool_str(resolved->needs.dns),
 	     bool_str(resolved->needs.route));
 
+	if (!resolved->needs.dns) {
+		resolve_default_route(&resolved->end[LEFT_END],
+				      &resolved->end[RIGHT_END],
+				      resolved->afi,
+				      verbose);
+		resolve_default_route(&resolved->end[RIGHT_END],
+				      &resolved->end[LEFT_END],
+				      resolved->afi,
+				      verbose);
+	}
+
 	build_connection_host_and_proposals_from_resolve(c, resolved, verbose);
 
 	/*