X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=7b73a0b890837988b030d00e7d38c9f077a91496;hb=4e445f017dd2c5aaa204002db74584fec457f9d8;hp=6dcdced61bf0df795b711a85fe2e6c59e6e3c923;hpb=70730f50e09cac648b1c3b48f0a1e6ed40cc510f;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/main.c b/src/main.c
index 6dcdced..7b73a0b 100755
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,10 @@
 #define DEFAULT_INPUT_REQUEST_TIMEOUT (120 * 1000)
 #define DEFAULT_BROWSER_LAUNCH_TIMEOUT (300 * 1000)
 
+#if defined TIZEN_EXT
+#define DEFAULT_WIFI_INTERFACE "wlan0"
+#endif
+
 #define MAINFILE "main.conf"
 #define CONFIGMAINFILE CONFIGDIR "/" MAINFILE
 
@@ -99,6 +103,11 @@ static struct {
 	bool auto_ip;
 	char *global_nameserver;
 	bool supplicant_debug;
+	char *def_wifi_ifname;
+	bool file_log;
+	bool dlog_log;
+	bool simple_log;
+	bool wifi_roam_scan;
 #endif
 } connman_settings  = {
 	.bg_scan = true,
@@ -128,6 +137,11 @@ static struct {
 	.auto_ip = true,
 	.global_nameserver = NULL,
 	.supplicant_debug = false,
+	.def_wifi_ifname = DEFAULT_WIFI_INTERFACE,
+	.file_log = true,
+	.dlog_log = true,
+	.simple_log = true,
+	.wifi_roam_scan = true,
 #endif
 };
 
@@ -214,6 +228,11 @@ static struct {
 #define CONF_ENABLE_AUTO_IP		        "EnableAutoIp"
 #define CONF_GLOBAL_NAMESERVER          "GlobalNameserver"
 #define CONF_CONNMAN_SUPPLICANT_DEBUG   "ConnmanSupplicantDebug"
+#define CONF_CONNMAN_WIFI_DEF_IFNAME    "DefaultWifiInterface"
+#define CONF_CONNMAN_FILE_LOG           "FileLogging"
+#define CONF_CONNMAN_DLOG_LOG           "DlogLogging"
+#define CONF_CONNMAN_SIMPLIFIED_LOG     "SimplifiedLog"
+#define CONF_CONNMAN_WIFI_ROAM_SCAN     "WifiRoamingScan"
 #endif
 
 #if defined TIZEN_EXT
@@ -271,6 +290,11 @@ static const char *supported_options[] = {
 	CONF_ENABLE_AUTO_IP,
 	CONF_GLOBAL_NAMESERVER,
 	CONF_CONNMAN_SUPPLICANT_DEBUG,
+	CONF_CONNMAN_WIFI_DEF_IFNAME,
+	CONF_CONNMAN_FILE_LOG,
+	CONF_CONNMAN_DLOG_LOG,
+	CONF_CONNMAN_SIMPLIFIED_LOG,
+	CONF_CONNMAN_WIFI_ROAM_SCAN,
 #endif
 	NULL
 };
@@ -611,6 +635,7 @@ static void check_Tizen_configuration(GKeyFile *config)
 	GError *error = NULL;
 	char **cellular_interfaces;
 	char *global_nameserver;
+	char *default_wifi_ifname;
 	bool boolean;
 	gsize len;
 
@@ -650,6 +675,39 @@ static void check_Tizen_configuration(GKeyFile *config)
 
 	g_clear_error(&error);
 
+	default_wifi_ifname = __connman_config_get_string(config, "General",
+			CONF_CONNMAN_WIFI_DEF_IFNAME, &error);
+	if (!error)
+		connman_settings.def_wifi_ifname = default_wifi_ifname;
+
+	g_clear_error(&error);
+
+	boolean = __connman_config_get_bool(config, "General",
+			CONF_CONNMAN_FILE_LOG, &error);
+	if (!error)
+		connman_settings.file_log = boolean;
+
+	g_clear_error(&error);
+
+	boolean = __connman_config_get_bool(config, "General",
+			CONF_CONNMAN_DLOG_LOG, &error);
+	if (!error)
+		connman_settings.dlog_log = boolean;
+
+	g_clear_error(&error);
+
+	boolean = __connman_config_get_bool(config, "General",
+			CONF_CONNMAN_SIMPLIFIED_LOG, &error);
+	if (!error)
+		connman_settings.simple_log = boolean;
+
+	boolean = __connman_config_get_bool(config, "General",
+			CONF_CONNMAN_WIFI_ROAM_SCAN, &error);
+	if (!error)
+		connman_settings.wifi_roam_scan = boolean;
+
+	g_clear_error(&error);
+
 	check_Tizen_INS_configuration(config);
 }
 
@@ -717,6 +775,8 @@ static void parse_config(GKeyFile *config)
 		connman_settings.auto_connect =
 			parse_service_types(default_auto_connect, CONF_ARRAY_SIZE(default_auto_connect));
 
+	g_strfreev(str_list);
+
 	g_clear_error(&error);
 
 	str_list = __connman_config_get_string_list(config, "General",
@@ -892,6 +952,11 @@ static int config_init(const char *file)
 	if (config)
 		g_key_file_free(config);
 
+#if defined TIZEN_EXT
+	set_simple_log_option(connman_settings.simple_log);
+	set_dlog_logging_option(connman_settings.dlog_log);
+	set_file_logging_option(connman_settings.file_log);
+#endif
 	return 0;
 }
 
@@ -1067,14 +1132,15 @@ const char *connman_option_get_string(const char *key)
 #if defined TIZEN_EXT
 	if (g_str_equal(key, CONF_GLOBAL_NAMESERVER))
 		return connman_settings.global_nameserver;
-#endif
 
-#if defined TIZEN_EXT
 	if (g_str_equal(key, CONF_INS_PREFERRED_FREQ_BSSID))
 		return connman_ins_settings.ins_preferred_freq_bssid;
 
 	if (g_str_equal(key, CONF_INS_PREFERRED_FREQ))
 		return connman_ins_settings.ins_preferred_freq;
+
+	if (g_str_equal(key, CONF_CONNMAN_WIFI_DEF_IFNAME))
+		return connman_settings.def_wifi_ifname;
 #endif
 	return NULL;
 }
@@ -1117,6 +1183,18 @@ bool connman_setting_get_bool(const char *key)
 
 	if (g_str_equal(key, CONF_CONNMAN_SUPPLICANT_DEBUG))
 		return connman_settings.supplicant_debug;
+
+	if (g_str_equal(key, CONF_CONNMAN_FILE_LOG))
+		return connman_settings.file_log;
+
+	if (g_str_equal(key, CONF_CONNMAN_DLOG_LOG))
+		return connman_settings.dlog_log;
+
+	if (g_str_equal(key, CONF_CONNMAN_SIMPLIFIED_LOG))
+		return connman_settings.simple_log;
+
+	if (g_str_equal(key, CONF_CONNMAN_WIFI_ROAM_SCAN))
+		return connman_settings.wifi_roam_scan;
 #endif
 
 #if defined TIZEN_EXT
@@ -1343,7 +1421,11 @@ int main(int argc, char *argv[])
 	__connman_clock_init();
 
 	__connman_ipconfig_init();
+#if defined TIZEN_EXT
+	__connman_rtnl_init(GIO_SOCKET_RETRY_COUNT);
+#else /* TIZEN_EXT */
 	__connman_rtnl_init();
+#endif /* TIZEN_EXT */
 	__connman_task_init();
 	__connman_proxy_init();
 	__connman_detect_init();