main: Add 'DefaultAutoConnectTechnologies' configuration option

[framework/connectivity/connman.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 535d2d1..e539e6d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -44,8 +44,12 @@
 
 static struct {
        connman_bool_t bg_scan;
+       char **pref_timeservers;
+       unsigned int *auto_connect;
 } connman_settings  = {
        .bg_scan = TRUE,
+       .pref_timeservers = NULL,
+       .auto_connect = NULL,
 };
 
 static GKeyFile *load_config(const char *file)
@@ -71,10 +75,44 @@ static GKeyFile *load_config(const char *file)
        return keyfile;
 }
 
+static uint *parse_service_types(char **str_list, gsize len)
+{
+       unsigned int *type_list;
+       int i, j;
+       enum connman_service_type type;
+
+       type_list = g_try_new0(unsigned int, len + 1);
+       if (type_list == NULL)
+               return NULL;
+
+       i = 0;
+       j = 0;
+       while (str_list[i] != NULL)
+       {
+               type = __connman_service_string2type(str_list[i]);
+
+               if (type != CONNMAN_SERVICE_TYPE_UNKNOWN) {
+                       type_list[j] = type;
+                       j += 1;
+               }
+               i += 1;
+       }
+
+       return type_list;
+}
+
 static void parse_config(GKeyFile *config)
 {
        GError *error = NULL;
        gboolean boolean;
+       char **timeservers;
+       char **str_list;
+       gsize len;
+       char *default_auto_connect[] = {
+               "wifi",
+               "ethernet",
+               "cellular",
+       };
 
        if (config == NULL)
                return;
@@ -87,6 +125,27 @@ static void parse_config(GKeyFile *config)
                connman_settings.bg_scan = boolean;
 
        g_clear_error(&error);
+
+       timeservers = g_key_file_get_string_list(config, "General",
+                                               "FallbackTimeservers", NULL, &error);
+       if (error == NULL)
+               connman_settings.pref_timeservers = timeservers;
+
+       g_clear_error(&error);
+
+       str_list = g_key_file_get_string_list(config, "General",
+                       "DefaultAutoConnectTechnologies", &len, &error);
+
+       if (error == NULL)
+               connman_settings.auto_connect =
+                       parse_service_types(str_list, len);
+       else
+               connman_settings.auto_connect =
+                       parse_service_types(default_auto_connect, 3);
+
+       g_strfreev(str_list);
+
+       g_clear_error(&error);
 }
 
 static GMainLoop *main_loop = NULL;
@@ -237,6 +296,22 @@ connman_bool_t connman_setting_get_bool(const char *key)
        return FALSE;
 }
 
+char **connman_setting_get_string_list(const char *key)
+{
+       if (g_str_equal(key, "FallbackTimeservers") == TRUE)
+               return connman_settings.pref_timeservers;
+
+       return NULL;
+}
+
+unsigned int *connman_setting_get_uint_list(const char *key)
+{
+       if (g_str_equal(key, "DefaultAutoConnectTechnologies") == TRUE)
+               return connman_settings.auto_connect;
+
+       return NULL;
+}
+
 int main(int argc, char *argv[])
 {
        GOptionContext *context;
@@ -293,12 +368,6 @@ int main(int argc, char *argv[])
                        perror("Failed to create storage directory");
        }
 
-       if (mkdir(STORAGEDIR "/stats", S_IRUSR | S_IWUSR | S_IXUSR |
-                               S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) < 0) {
-               if (errno != EEXIST)
-                       perror("Failed to create statistics directory");
-       }
-
        umask(0077);
 
        main_loop = g_main_loop_new(NULL, FALSE);
@@ -326,7 +395,7 @@ int main(int argc, char *argv[])
 
        g_dbus_set_disconnect_function(conn, disconnect_callback, NULL, NULL);
 
-       __connman_log_init(option_debug, option_detach);
+       __connman_log_init(argv[0], option_debug, option_detach);
 
        __connman_dbus_init(conn);
 
@@ -334,17 +403,18 @@ int main(int argc, char *argv[])
 
        parse_config(config);
 
-       __connman_storage_init();
+       __connman_storage_migrate();
        __connman_technology_init();
        __connman_notifier_init();
-       __connman_location_init();
        __connman_service_init();
        __connman_provider_init();
        __connman_network_init();
        __connman_device_init(option_device, option_nodevice);
 
        __connman_agent_init();
+       __connman_ippool_init();
        __connman_iptables_init();
+       __connman_nat_init();
        __connman_tethering_init();
        __connman_counter_init();
        __connman_manager_init();
@@ -366,6 +436,7 @@ int main(int argc, char *argv[])
 
        __connman_rtnl_start();
        __connman_dhcp_init();
+       __connman_dhcpv6_init();
        __connman_wpad_init();
        __connman_wispr_init();
        __connman_rfkill_init();
@@ -382,6 +453,7 @@ int main(int argc, char *argv[])
        __connman_rfkill_cleanup();
        __connman_wispr_cleanup();
        __connman_wpad_cleanup();
+       __connman_dhcpv6_cleanup();
        __connman_dhcp_cleanup();
        __connman_provider_cleanup();
        __connman_plugin_cleanup();
@@ -392,7 +464,6 @@ int main(int argc, char *argv[])
        __connman_proxy_cleanup();
        __connman_task_cleanup();
        __connman_rtnl_cleanup();
-       __connman_ipconfig_cleanup();
        __connman_resolver_cleanup();
 
        __connman_clock_cleanup();
@@ -402,14 +473,15 @@ int main(int argc, char *argv[])
        __connman_counter_cleanup();
        __connman_agent_cleanup();
        __connman_tethering_cleanup();
+       __connman_nat_cleanup();
        __connman_iptables_cleanup();
+       __connman_ippool_cleanup();
        __connman_device_cleanup();
        __connman_network_cleanup();
        __connman_service_cleanup();
-       __connman_location_cleanup();
+       __connman_ipconfig_cleanup();
        __connman_notifier_cleanup();
        __connman_technology_cleanup();
-       __connman_storage_cleanup();
 
        __connman_dbus_cleanup();
 
@@ -422,5 +494,12 @@ int main(int argc, char *argv[])
        if (config)
                g_key_file_free(config);
 
+       if (connman_settings.pref_timeservers != NULL)
+               g_strfreev(connman_settings.pref_timeservers);
+
+       g_free(connman_settings.auto_connect);
+
+       g_free(option_debug);
+
        return 0;
 }