X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=a39adb31034e1c167a199536ae843d91d61c2e96;hb=89077bfd2abf7984027552c8cee223a0c6dab57c;hp=0de8cd1678800735124d7a9b8e8629a0646ba3a4;hpb=3973603a07be70d0a5a0dfda88d71bc9252a9c0a;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/main.c b/src/main.c
index 0de8cd1..a39adb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -23,27 +23,43 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <signal.h>
+#include <sys/signalfd.h>
 #include <getopt.h>
 #include <sys/stat.h>
 #include <net/if.h>
+#include <netdb.h>
 
 #include <gdbus.h>
 
-#ifdef HAVE_CAPNG
-#include <cap-ng.h>
-#endif
-
 #include "connman.h"
 
+#define DEFAULT_INPUT_REQUEST_TIMEOUT 120 * 1000
+#define DEFAULT_BROWSER_LAUNCH_TIMEOUT 300 * 1000
+
 static struct {
 	connman_bool_t bg_scan;
+	char **pref_timeservers;
+	unsigned int *auto_connect;
+	unsigned int *preferred_techs;
+	char **fallback_nameservers;
+	unsigned int timeout_inputreq;
+	unsigned int timeout_browserlaunch;
+	char **blacklisted_interfaces;
 } connman_settings  = {
 	.bg_scan = TRUE,
+	.pref_timeservers = NULL,
+	.auto_connect = NULL,
+	.preferred_techs = NULL,
+	.fallback_nameservers = NULL,
+	.timeout_inputreq = DEFAULT_INPUT_REQUEST_TIMEOUT,
+	.timeout_browserlaunch = DEFAULT_BROWSER_LAUNCH_TIMEOUT,
+	.blacklisted_interfaces = NULL,
 };
 
 static GKeyFile *load_config(const char *file)
@@ -56,7 +72,11 @@ static GKeyFile *load_config(const char *file)
 	g_key_file_set_list_separator(keyfile, ',');
 
 	if (!g_key_file_load_from_file(keyfile, file, 0, &err)) {
-		connman_error("Parsing %s failed: %s", file, err->message);
+		if (err->code != G_FILE_ERROR_NOENT) {
+			connman_error("Parsing %s failed: %s", file,
+								err->message);
+		}
+
 		g_error_free(err);
 		g_key_file_free(keyfile);
 		return NULL;
@@ -65,13 +85,82 @@ 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 char **parse_fallback_nameservers(char **nameservers, gsize len)
+{
+	char **servers;
+	int i, j;
+
+	servers = g_try_new0(char *, len + 1);
+	if (servers == NULL)
+		return NULL;
+
+	i = 0;
+	j = 0;
+	while (nameservers[i] != NULL) {
+		if (connman_inet_check_ipaddress(nameservers[i]) > 0) {
+			servers[j] = g_strdup(nameservers[i]);
+			j += 1;
+		}
+		i += 1;
+	}
+
+	return servers;
+}
+
 static void parse_config(GKeyFile *config)
 {
 	GError *error = NULL;
 	gboolean boolean;
-
-	if (config == NULL)
+	char **timeservers;
+	char **interfaces;
+	char **str_list;
+	gsize len;
+	static char *default_auto_connect[] = {
+		"wifi",
+		"ethernet",
+		"cellular",
+		NULL
+	};
+	static char *default_blacklist[] = {
+		"vmnet",
+		"vboxnet",
+		"virbr",
+		NULL
+	};
+	int timeout;
+
+	if (config == NULL) {
+		connman_settings.auto_connect =
+			parse_service_types(default_auto_connect, 3);
+		connman_settings.blacklisted_interfaces = default_blacklist;
 		return;
+	}
 
 	DBG("parsing main.conf");
 
@@ -81,15 +170,145 @@ 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);
+
+	str_list = g_key_file_get_string_list(config, "General",
+			"PreferredTechnologies", &len, &error);
+
+	if (error == NULL)
+		connman_settings.preferred_techs =
+			parse_service_types(str_list, len);
+
+	g_strfreev(str_list);
+
+	g_clear_error(&error);
+
+	str_list = g_key_file_get_string_list(config, "General",
+			"FallbackNameservers", &len, &error);
+
+	if (error == NULL)
+		connman_settings.fallback_nameservers =
+			parse_fallback_nameservers(str_list, len);
+
+	g_strfreev(str_list);
+
+	g_clear_error(&error);
+
+	timeout = g_key_file_get_integer(config, "General",
+			"InputRequestTimeout", &error);
+	if (error == NULL && timeout >= 0)
+		connman_settings.timeout_inputreq = timeout * 1000;
+
+	g_clear_error(&error);
+
+	timeout = g_key_file_get_integer(config, "General",
+			"BrowserLaunchTimeout", &error);
+	if (error == NULL && timeout >= 0)
+		connman_settings.timeout_browserlaunch = timeout * 1000;
+
+	g_clear_error(&error);
+
+	interfaces = g_key_file_get_string_list(config, "General",
+			"NetworkInterfaceBlacklist", &len, &error);
+
+	if (error == NULL)
+		connman_settings.blacklisted_interfaces = interfaces;
+	else
+		connman_settings.blacklisted_interfaces = default_blacklist;
+
+	g_clear_error(&error);
 }
 
 static GMainLoop *main_loop = NULL;
 
-static void sig_term(int sig)
+static unsigned int __terminated = 0;
+
+static gboolean signal_handler(GIOChannel *channel, GIOCondition cond,
+							gpointer user_data)
 {
-	connman_info("Terminating");
+	struct signalfd_siginfo si;
+	ssize_t result;
+	int fd;
 
-	g_main_loop_quit(main_loop);
+	if (cond & (G_IO_NVAL | G_IO_ERR | G_IO_HUP))
+		return FALSE;
+
+	fd = g_io_channel_unix_get_fd(channel);
+
+	result = read(fd, &si, sizeof(si));
+	if (result != sizeof(si))
+		return FALSE;
+
+	switch (si.ssi_signo) {
+	case SIGINT:
+	case SIGTERM:
+		if (__terminated == 0) {
+			connman_info("Terminating");
+			g_main_loop_quit(main_loop);
+		}
+
+		__terminated = 1;
+		break;
+	}
+
+	return TRUE;
+}
+
+static guint setup_signalfd(void)
+{
+	GIOChannel *channel;
+	guint source;
+	sigset_t mask;
+	int fd;
+
+	sigemptyset(&mask);
+	sigaddset(&mask, SIGINT);
+	sigaddset(&mask, SIGTERM);
+
+	if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0) {
+		perror("Failed to set signal mask");
+		return 0;
+	}
+
+	fd = signalfd(-1, &mask, 0);
+	if (fd < 0) {
+		perror("Failed to create signal descriptor");
+		return 0;
+	}
+
+	channel = g_io_channel_unix_new(fd);
+
+	g_io_channel_set_close_on_unref(channel, TRUE);
+	g_io_channel_set_encoding(channel, NULL, NULL);
+	g_io_channel_set_buffered(channel, FALSE);
+
+	source = g_io_add_watch(channel,
+				G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+				signal_handler, NULL);
+
+	g_io_channel_unref(channel);
+
+	return source;
 }
 
 static void disconnect_callback(DBusConnection *conn, void *user_data)
@@ -168,18 +387,47 @@ 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;
+
+	if (g_str_equal(key, "FallbackNameservers") == TRUE)
+		return connman_settings.fallback_nameservers;
+
+	if (g_str_equal(key, "NetworkInterfaceBlacklist") == TRUE)
+		return connman_settings.blacklisted_interfaces;
+
+	return NULL;
+}
+
+unsigned int *connman_setting_get_uint_list(const char *key)
+{
+	if (g_str_equal(key, "DefaultAutoConnectTechnologies") == TRUE)
+		return connman_settings.auto_connect;
+
+	if (g_str_equal(key, "PreferredTechnologies") == TRUE)
+		return connman_settings.preferred_techs;
+
+	return NULL;
+}
+
+unsigned int connman_timeout_input_request(void) {
+	return connman_settings.timeout_inputreq;
+}
+
+unsigned int connman_timeout_browser_launch(void) {
+	return connman_settings.timeout_browserlaunch;
+}
+
 int main(int argc, char *argv[])
 {
 	GOptionContext *context;
 	GError *error = NULL;
 	DBusConnection *conn;
 	DBusError err;
-	struct sigaction sa;
 	GKeyFile *config;
-
-#ifdef HAVE_CAPNG
-	/* Drop capabilities */
-#endif
+	guint signal;
 
 #ifdef NEED_THREADS
 	if (g_thread_supported() == FALSE)
@@ -224,12 +472,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);
@@ -241,6 +483,8 @@ int main(int argc, char *argv[])
 	}
 #endif
 
+	signal = setup_signalfd();
+
 	dbus_error_init(&err);
 
 	conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, CONNMAN_SERVICE, &err);
@@ -255,24 +499,30 @@ 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);
 
 	config = load_config(CONFIGDIR "/main.conf");
-
 	parse_config(config);
+	if (config != NULL)
+		g_key_file_free(config);
 
-	__connman_storage_init();
-	__connman_element_init();
+	__connman_storage_migrate();
+	__connman_technology_init();
+	__connman_notifier_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();
-	__connman_profile_init();
 	__connman_config_init();
 	__connman_stats_init();
 	__connman_clock_init();
@@ -289,24 +539,29 @@ int main(int argc, char *argv[])
 
 	__connman_plugin_init(option_plugin, option_noplugin);
 
-	__connman_element_start();
+	__connman_rtnl_start();
+	__connman_dhcp_init();
+	__connman_dhcpv6_init();
+	__connman_wpad_init();
+	__connman_wispr_init();
+	__connman_rfkill_init();
 
 	g_free(option_device);
 	g_free(option_plugin);
 	g_free(option_nodevice);
 	g_free(option_noplugin);
 
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = sig_term;
-	sigaction(SIGINT, &sa, NULL);
-	sigaction(SIGTERM, &sa, NULL);
-
 	g_main_loop_run(main_loop);
 
-	__connman_element_stop();
+	g_source_remove(signal);
 
+	__connman_rfkill_cleanup();
+	__connman_wispr_cleanup();
+	__connman_wpad_cleanup();
+	__connman_dhcpv6_cleanup();
+	__connman_dhcp_cleanup();
+	__connman_provider_cleanup();
 	__connman_plugin_cleanup();
-
 	__connman_connection_cleanup();
 	__connman_timeserver_cleanup();
 	__connman_session_cleanup();
@@ -314,22 +569,24 @@ int main(int argc, char *argv[])
 	__connman_proxy_cleanup();
 	__connman_task_cleanup();
 	__connman_rtnl_cleanup();
-	__connman_ipconfig_cleanup();
 	__connman_resolver_cleanup();
 
 	__connman_clock_cleanup();
 	__connman_stats_cleanup();
 	__connman_config_cleanup();
-	__connman_profile_cleanup();
 	__connman_manager_cleanup();
 	__connman_counter_cleanup();
 	__connman_agent_cleanup();
 	__connman_tethering_cleanup();
+	__connman_nat_cleanup();
 	__connman_iptables_cleanup();
-
+	__connman_ippool_cleanup();
 	__connman_device_cleanup();
-	__connman_element_cleanup();
-	__connman_storage_cleanup();
+	__connman_network_cleanup();
+	__connman_service_cleanup();
+	__connman_ipconfig_cleanup();
+	__connman_notifier_cleanup();
+	__connman_technology_cleanup();
 
 	__connman_dbus_cleanup();
 
@@ -339,8 +596,14 @@ int main(int argc, char *argv[])
 
 	g_main_loop_unref(main_loop);
 
-	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(connman_settings.preferred_techs);
+	g_strfreev(connman_settings.fallback_nameservers);
+
+	g_free(option_debug);
 
 	return 0;
 }