resolve: move defaultroute call out of helper

diff --git a/programs/pluto/resolve_helper.c b/programs/pluto/resolve_helper.c
index 14aedc86f2c7c5789296d850ee1a485611c9f75c..08ac26a76b107616c4ed5fd25abf0aa064bd8fec 100644 (file)
--- 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);
 
        /*