Include settings struct in app_state

Allow settings to be taken into consideration when changing application
state.

Author: killenheladagen

app/dockerdwrapper.c

@@ -76,6 +76,7 @@ struct app_state {
     volatile int allow_dockerd_to_start_atomic;
     char* sd_card_area;
     AXParameter* param_handle;
+    struct settings settings;
 };
 
 static bool dockerd_allowed_to_start(const struct app_state* app_state) {
@@ -400,8 +401,10 @@ static gboolean get_and_verify_tls_selection(AXParameter* param_handle, bool* us
 
 // Read and verify consistency of settings. Call set_status_parameter() or quit_program() and return
 // false on error.
-static bool read_settings(struct settings* settings, const struct app_state* app_state) {
+static bool read_settings(struct app_state* app_state) {
     AXParameter* param_handle = app_state->param_handle;
+    struct settings* settings = &app_state->settings;
+
     settings->use_tcp_socket = is_parameter_yes(param_handle, PARAM_TCP_SOCKET);
 
     if (!settings->use_tcp_socket)
@@ -545,8 +548,9 @@ static const char* build_daemon_args(const struct settings* settings, AXParamete
 
 // Start dockerd. On success, call set_status_parameter(STATUS_RUNNING) and on error,
 // call set_status_parameter(STATUS_NOT_STARTED).
-static bool start_dockerd(const struct settings* settings, struct app_state* app_state) {
+static bool start_dockerd(struct app_state* app_state) {
     AXParameter* param_handle = app_state->param_handle;
+    const struct settings* settings = &app_state->settings;
     GError* error = NULL;
     bool result = false;
     bool return_value = false;
@@ -585,12 +589,8 @@ static bool start_dockerd(const struct settings* settings, struct app_state* app
 }
 
 static void read_settings_and_start_dockerd(struct app_state* app_state) {
-    struct settings settings = {0};
-
-    if (read_settings(&settings, app_state))
-        start_dockerd(&settings, app_state);
-
-    free(settings.data_root);
+    if (read_settings(app_state))
+        start_dockerd(app_state);
 }
 
 static bool send_signal(const char* name, GPid pid, int sig) {
@@ -880,6 +880,7 @@ int main(int argc, char** argv) {
     }
 
     sd_disk_storage_free(sd_disk_storage);
+    free(app_state.settings.data_root);
     free(app_state.sd_card_area);
 
     return application_exit_code;