Add some options in main.conf for wifi roaming

[platform/upstream/connman.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 0700304..e83e43f 100755 (executable)
--- a/src/main.c
+++ b/src/main.c
@@ -46,8 +46,17 @@
 #define DEFAULT_INPUT_REQUEST_TIMEOUT (120 * 1000)
 #define DEFAULT_BROWSER_LAUNCH_TIMEOUT (300 * 1000)
 
+/*
+ * We set the integer to 1 sec so that we have a chance to get
+ * necessary IPv6 router advertisement messages that might have
+ * DNS data etc.
+ */
+#define DEFAULT_ONLINE_CHECK_INITIAL_INTERVAL 1
+#define DEFAULT_ONLINE_CHECK_MAX_INTERVAL 12
+
 #if defined TIZEN_EXT
 #define DEFAULT_WIFI_INTERFACE "wlan0"
+#define CONTAINER_FILE "/run/systemd/container"
 #endif
 
 #define MAINFILE "main.conf"
@@ -94,6 +103,9 @@ static struct {
        bool enable_6to4;
        char *vendor_class_id;
        bool enable_online_check;
+       bool enable_online_to_ready_transition;
+       unsigned int online_check_initial_interval;
+       unsigned int online_check_max_interval;
        bool auto_connect_roaming_services;
        bool acd;
        bool use_gateways_as_timeservers;
@@ -104,6 +116,16 @@ static struct {
        char *global_nameserver;
        bool supplicant_debug;
        char *def_wifi_ifname;
+       bool file_log;
+       bool dlog_log;
+       bool simple_log;
+       bool wifi_roam_scan;
+       int wifi_roam_scan_interval;
+       bool wifi_roam;
+       int wifi_roam_min_snr;
+       int wifi_roam_min_rssi_2_4GHz;
+       int wifi_roam_min_rssi_5GHz;
+       bool auto_connection_scan;
 #endif
 } connman_settings  = {
        .bg_scan = true,
@@ -124,6 +146,9 @@ static struct {
        .enable_6to4 = false,
        .vendor_class_id = NULL,
        .enable_online_check = true,
+       .enable_online_to_ready_transition = false,
+       .online_check_initial_interval = DEFAULT_ONLINE_CHECK_INITIAL_INTERVAL,
+       .online_check_max_interval = DEFAULT_ONLINE_CHECK_MAX_INTERVAL,
        .auto_connect_roaming_services = false,
        .acd = false,
        .use_gateways_as_timeservers = false,
@@ -134,6 +159,16 @@ static struct {
        .global_nameserver = NULL,
        .supplicant_debug = false,
        .def_wifi_ifname = DEFAULT_WIFI_INTERFACE,
+       .file_log = true,
+       .dlog_log = true,
+       .simple_log = true,
+       .wifi_roam_scan = false,
+       .wifi_roam_scan_interval = 30,
+       .wifi_roam = false,
+       .wifi_roam_min_snr = 0,
+       .wifi_roam_min_rssi_2_4GHz = 0,
+       .wifi_roam_min_rssi_5GHz = 0,
+       .auto_connection_scan = false,
 #endif
 };
 
@@ -211,6 +246,9 @@ static struct {
 #define CONF_ENABLE_6TO4                "Enable6to4"
 #define CONF_VENDOR_CLASS_ID            "VendorClassID"
 #define CONF_ENABLE_ONLINE_CHECK        "EnableOnlineCheck"
+#define CONF_ENABLE_ONLINE_TO_READY_TRANSITION "EnableOnlineToReadyTransition"
+#define CONF_ONLINE_CHECK_INITIAL_INTERVAL "OnlineCheckInitialInterval"
+#define CONF_ONLINE_CHECK_MAX_INTERVAL     "OnlineCheckMaxInterval"
 #define CONF_AUTO_CONNECT_ROAMING_SERVICES "AutoConnectRoamingServices"
 #define CONF_ACD                        "AddressConflictDetection"
 #define CONF_USE_GATEWAYS_AS_TIMESERVERS "UseGatewaysAsTimeservers"
@@ -219,8 +257,18 @@ static struct {
 #define CONF_TIZEN_TV_EXT                      "TizenTVExtension"
 #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_SUPPLICANT_DEBUG           "ConnmanSupplicantDebug"
+#define CONF_WIFI_DEF_IFNAME            "DefaultWifiInterface"
+#define CONF_FILE_LOG                   "FileLogging"
+#define CONF_DLOG_LOG                   "DlogLogging"
+#define CONF_SIMPLIFIED_LOG             "SimplifiedLog"
+#define CONF_WIFI_ROAM_SCAN             "WifiRoamingScan"
+#define CONF_WIFI_ROAM_SCAN_INTERVAL    "WifiRoamingScanInterval"
+#define CONF_WIFI_ROAM                  "WifiRoaming"
+#define CONF_WIFI_ROAM_MIN_SNR          "WifiRoamingMinSNR"
+#define CONF_WIFI_ROAM_MIN_RSSI_2_4     "WifiRoamingMinRSSI_2_4GHz"
+#define CONF_WIFI_ROAM_MIN_RSSI_5       "WifiRoamingMinRSSI_5GHz"
+#define CONF_WIFI_AUTO_CONNECTION_SCAN  "AutoConnectionScan"
 #endif
 
 #if defined TIZEN_EXT
@@ -248,13 +296,14 @@ static struct {
 #define CONF_INS_INTERNET_SCORE              "INSInternetScore"
 /* Common */
 #define CONF_INS_SIGNAL_LEVEL3_5GHZ          "INSSignalLevel3_5GHz"
-#define CONF_INS_SIGNAL_LEVEL3_24GHZ         "INSSignalLevel3_24GHz"
+#define CONF_INS_SIGNAL_LEVEL3_2_4GHZ        "INSSignalLevel3_2_4GHz"
 #endif
 
 static const char *supported_options[] = {
        CONF_BG_SCAN,
        CONF_PREF_TIMESERVERS,
        CONF_AUTO_CONNECT_TECHS,
+       CONF_FAVORITE_TECHS,
        CONF_ALWAYS_CONNECTED_TECHS,
        CONF_PREFERRED_TECHS,
        CONF_FALLBACK_NAMESERVERS,
@@ -269,6 +318,9 @@ static const char *supported_options[] = {
        CONF_ENABLE_6TO4,
        CONF_VENDOR_CLASS_ID,
        CONF_ENABLE_ONLINE_CHECK,
+       CONF_ENABLE_ONLINE_TO_READY_TRANSITION,
+       CONF_ONLINE_CHECK_INITIAL_INTERVAL,
+       CONF_ONLINE_CHECK_MAX_INTERVAL,
        CONF_AUTO_CONNECT_ROAMING_SERVICES,
        CONF_ACD,
        CONF_USE_GATEWAYS_AS_TIMESERVERS,
@@ -277,8 +329,18 @@ static const char *supported_options[] = {
        CONF_TIZEN_TV_EXT,
        CONF_ENABLE_AUTO_IP,
        CONF_GLOBAL_NAMESERVER,
-       CONF_CONNMAN_SUPPLICANT_DEBUG,
-       CONF_CONNMAN_WIFI_DEF_IFNAME,
+       CONF_SUPPLICANT_DEBUG,
+       CONF_WIFI_DEF_IFNAME,
+       CONF_FILE_LOG,
+       CONF_DLOG_LOG,
+       CONF_SIMPLIFIED_LOG,
+       CONF_WIFI_ROAM_SCAN,
+       CONF_WIFI_ROAM_SCAN_INTERVAL,
+       CONF_WIFI_ROAM,
+       CONF_WIFI_ROAM_MIN_SNR,
+       CONF_WIFI_ROAM_MIN_RSSI_2_4,
+       CONF_WIFI_ROAM_MIN_RSSI_5,
+       CONF_WIFI_AUTO_CONNECTION_SCAN,
 #endif
        NULL
 };
@@ -309,7 +371,7 @@ static const char *supported_ins_options[] = {
        CONF_INS_INTERNET_SCORE,
        /* Common */
        CONF_INS_SIGNAL_LEVEL3_5GHZ,
-       CONF_INS_SIGNAL_LEVEL3_24GHZ,
+       CONF_INS_SIGNAL_LEVEL3_2_4GHZ,
        NULL
 };
 #endif
@@ -453,7 +515,7 @@ static void check_config(GKeyFile *config)
 }
 
 #if defined TIZEN_EXT
-static void check_Tizen_INS_configuration(GKeyFile *config)
+static void check_tizen_ins_configuration(GKeyFile *config)
 {
        GError *error = NULL;
        char *ins_preferred_freq_bssid;
@@ -607,20 +669,21 @@ static void check_Tizen_INS_configuration(GKeyFile *config)
        g_clear_error(&error);
 
        integer = g_key_file_get_integer(config, "INS",
-                       CONF_INS_SIGNAL_LEVEL3_24GHZ, &error);
+                       CONF_INS_SIGNAL_LEVEL3_2_4GHZ, &error);
        if (!error)
                connman_ins_settings.ins_signal_level3_24ghz = integer;
 
        g_clear_error(&error);
 }
 
-static void check_Tizen_configuration(GKeyFile *config)
+static void check_tizen_configuration(GKeyFile *config)
 {
        GError *error = NULL;
        char **cellular_interfaces;
        char *global_nameserver;
        char *default_wifi_ifname;
        bool boolean;
+       int integer;
        gsize len;
 
        cellular_interfaces = g_key_file_get_string_list(config, "General",
@@ -653,20 +716,90 @@ static void check_Tizen_configuration(GKeyFile *config)
        g_clear_error(&error);
 
        boolean = __connman_config_get_bool(config, "General",
-                       CONF_CONNMAN_SUPPLICANT_DEBUG, &error);
+                       CONF_SUPPLICANT_DEBUG, &error);
        if (!error)
                connman_settings.supplicant_debug = boolean;
 
        g_clear_error(&error);
 
        default_wifi_ifname = __connman_config_get_string(config, "General",
-                       CONF_CONNMAN_WIFI_DEF_IFNAME, &error);
+                       CONF_WIFI_DEF_IFNAME, &error);
        if (!error)
                connman_settings.def_wifi_ifname = default_wifi_ifname;
 
        g_clear_error(&error);
 
-       check_Tizen_INS_configuration(config);
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_FILE_LOG, &error);
+       if (!error)
+               connman_settings.file_log = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_DLOG_LOG, &error);
+       if (!error)
+               connman_settings.dlog_log = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_SIMPLIFIED_LOG, &error);
+       if (!error)
+               connman_settings.simple_log = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_WIFI_ROAM_SCAN, &error);
+       if (!error)
+               connman_settings.wifi_roam_scan = boolean;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "General",
+                       CONF_WIFI_ROAM_SCAN_INTERVAL, &error);
+       if (!error && integer >= 0)
+               connman_settings.wifi_roam_scan_interval = integer;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_WIFI_ROAM, &error);
+       if (!error)
+               connman_settings.wifi_roam = boolean;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "General",
+                       CONF_WIFI_ROAM_MIN_SNR, &error);
+       if (!error && integer >= 0)
+               connman_settings.wifi_roam_min_snr = integer;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "General",
+                       CONF_WIFI_ROAM_MIN_RSSI_2_4, &error);
+       if (!error)
+               connman_settings.wifi_roam_min_rssi_2_4GHz = integer;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "General",
+                       CONF_WIFI_ROAM_MIN_RSSI_5, &error);
+       if (!error)
+               connman_settings.wifi_roam_min_rssi_5GHz = integer;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_WIFI_AUTO_CONNECTION_SCAN, &error);
+       if (!error)
+               connman_settings.auto_connection_scan = boolean;
+
+       g_clear_error(&error);
+
+       check_tizen_ins_configuration(config);
 }
 
 static void set_nofile_inc(void)
@@ -693,9 +826,9 @@ static void parse_config(GKeyFile *config)
        char **interfaces;
        char **str_list;
        char **tethering;
-        char *vendor_class_id;
+       char *string;
        gsize len;
-       int timeout;
+       int integer;
 
        if (!config) {
                connman_settings.auto_connect =
@@ -733,6 +866,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",
@@ -782,17 +917,17 @@ static void parse_config(GKeyFile *config)
 
        g_clear_error(&error);
 
-       timeout = g_key_file_get_integer(config, "General",
+       integer = g_key_file_get_integer(config, "General",
                        CONF_TIMEOUT_INPUTREQ, &error);
-       if (!error && timeout >= 0)
-               connman_settings.timeout_inputreq = timeout * 1000;
+       if (!error && integer >= 0)
+               connman_settings.timeout_inputreq = integer * 1000;
 
        g_clear_error(&error);
 
-       timeout = g_key_file_get_integer(config, "General",
+       integer = g_key_file_get_integer(config, "General",
                        CONF_TIMEOUT_BROWSERLAUNCH, &error);
-       if (!error && timeout >= 0)
-               connman_settings.timeout_browserlaunch = timeout * 1000;
+       if (!error && integer >= 0)
+               connman_settings.timeout_browserlaunch = integer * 1000;
 
        g_clear_error(&error);
 
@@ -853,10 +988,10 @@ static void parse_config(GKeyFile *config)
 
        g_clear_error(&error);
 
-       vendor_class_id = __connman_config_get_string(config, "General",
+       string = __connman_config_get_string(config, "General",
                                        CONF_VENDOR_CLASS_ID, &error);
        if (!error)
-               connman_settings.vendor_class_id = vendor_class_id;
+               connman_settings.vendor_class_id = string;
 
        g_clear_error(&error);
 
@@ -871,6 +1006,40 @@ static void parse_config(GKeyFile *config)
        g_clear_error(&error);
 
        boolean = __connman_config_get_bool(config, "General",
+                       CONF_ENABLE_ONLINE_TO_READY_TRANSITION, &error);
+       if (!error) {
+               connman_settings.enable_online_to_ready_transition = boolean;
+       }
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "General",
+                       CONF_ONLINE_CHECK_INITIAL_INTERVAL, &error);
+       if (!error && integer >= 0)
+               connman_settings.online_check_initial_interval = integer;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "General",
+                       CONF_ONLINE_CHECK_MAX_INTERVAL, &error);
+       if (!error && integer >= 0)
+               connman_settings.online_check_max_interval = integer;
+
+       g_clear_error(&error);
+
+       if (connman_settings.online_check_initial_interval < 1 ||
+               connman_settings.online_check_initial_interval >
+               connman_settings.online_check_max_interval) {
+               connman_warn("Incorrect online check intervals [%u, %u]",
+                               connman_settings.online_check_initial_interval,
+                               connman_settings.online_check_max_interval);
+               connman_settings.online_check_initial_interval =
+                       DEFAULT_ONLINE_CHECK_INITIAL_INTERVAL;
+               connman_settings.online_check_max_interval =
+                       DEFAULT_ONLINE_CHECK_MAX_INTERVAL;
+       }
+
+       boolean = __connman_config_get_bool(config, "General",
                                CONF_AUTO_CONNECT_ROAMING_SERVICES, &error);
        if (!error)
                connman_settings.auto_connect_roaming_services = boolean;
@@ -891,7 +1060,7 @@ static void parse_config(GKeyFile *config)
        g_clear_error(&error);
 
 #if defined TIZEN_EXT
-       check_Tizen_configuration(config);
+       check_tizen_configuration(config);
 #endif
 }
 
@@ -908,6 +1077,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;
 }
 
@@ -1068,7 +1242,7 @@ static GOptionEntry options[] = {
        { NULL },
 };
 
-const char *connman_option_get_string(const char *key)
+char *connman_setting_get_string(const char *key)
 {
        if (g_str_equal(key, CONF_VENDOR_CLASS_ID))
                return connman_settings.vendor_class_id;
@@ -1090,7 +1264,7 @@ const char *connman_option_get_string(const char *key)
        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))
+       if (g_str_equal(key, CONF_WIFI_DEF_IFNAME))
                return connman_settings.def_wifi_ifname;
 #endif
        return NULL;
@@ -1119,6 +1293,9 @@ bool connman_setting_get_bool(const char *key)
        if (g_str_equal(key, CONF_ENABLE_ONLINE_CHECK))
                return connman_settings.enable_online_check;
 
+       if (g_str_equal(key, CONF_ENABLE_ONLINE_TO_READY_TRANSITION))
+               return connman_settings.enable_online_to_ready_transition;
+
        if (g_str_equal(key, CONF_AUTO_CONNECT_ROAMING_SERVICES))
                return connman_settings.auto_connect_roaming_services;
 
@@ -1132,11 +1309,27 @@ bool connman_setting_get_bool(const char *key)
        if (g_str_equal(key, CONF_ENABLE_AUTO_IP))
                return connman_settings.auto_ip;
 
-       if (g_str_equal(key, CONF_CONNMAN_SUPPLICANT_DEBUG))
+       if (g_str_equal(key, CONF_SUPPLICANT_DEBUG))
                return connman_settings.supplicant_debug;
-#endif
 
-#if defined TIZEN_EXT
+       if (g_str_equal(key, CONF_FILE_LOG))
+               return connman_settings.file_log;
+
+       if (g_str_equal(key, CONF_DLOG_LOG))
+               return connman_settings.dlog_log;
+
+       if (g_str_equal(key, CONF_SIMPLIFIED_LOG))
+               return connman_settings.simple_log;
+
+       if (g_str_equal(key, CONF_WIFI_ROAM_SCAN))
+               return connman_settings.wifi_roam_scan;
+
+       if (g_str_equal(key, CONF_WIFI_ROAM))
+               return connman_settings.wifi_roam;
+
+       if (g_str_equal(key, CONF_WIFI_AUTO_CONNECTION_SCAN))
+               return connman_settings.auto_connection_scan;
+
        if (g_str_equal(key, CONF_INS_LAST_CONNECTED_BSSID))
                return connman_ins_settings.ins_last_connected_bssid;
 
@@ -1162,9 +1355,15 @@ bool connman_setting_get_bool(const char *key)
        return false;
 }
 
-#if defined TIZEN_EXT
 unsigned int connman_setting_get_uint(const char *key)
 {
+       if (g_str_equal(key, CONF_ONLINE_CHECK_INITIAL_INTERVAL))
+               return connman_settings.online_check_initial_interval;
+
+       if (g_str_equal(key, CONF_ONLINE_CHECK_MAX_INTERVAL))
+               return connman_settings.online_check_max_interval;
+
+#if defined TIZEN_EXT
        if (g_str_equal(key, CONF_INS_PREFERRED_FREQ_BSSID_SCORE))
                return connman_ins_settings.ins_preferred_freq_bssid_score;
 
@@ -1194,18 +1393,31 @@ unsigned int connman_setting_get_uint(const char *key)
 
        if (g_str_equal(key, CONF_INS_INTERNET_SCORE))
                return connman_ins_settings.ins_internet_score;
-
+#endif
        return 0;
 }
 
+#if defined TIZEN_EXT
 int connman_setting_get_int(const char *key)
 {
        if (g_str_equal(key, CONF_INS_SIGNAL_LEVEL3_5GHZ))
                return connman_ins_settings.ins_signal_level3_5ghz;
 
-       if (g_str_equal(key, CONF_INS_SIGNAL_LEVEL3_24GHZ))
+       if (g_str_equal(key, CONF_INS_SIGNAL_LEVEL3_2_4GHZ))
                return connman_ins_settings.ins_signal_level3_24ghz;
 
+       if (g_str_equal(key, CONF_WIFI_ROAM_MIN_SNR))
+               return connman_settings.wifi_roam_min_snr;
+
+       if (g_str_equal(key, CONF_WIFI_ROAM_MIN_RSSI_2_4))
+               return connman_settings.wifi_roam_min_rssi_2_4GHz;
+
+       if (g_str_equal(key, CONF_WIFI_ROAM_MIN_RSSI_5))
+               return connman_settings.wifi_roam_min_rssi_5GHz;
+
+       if (g_str_equal(key, CONF_WIFI_ROAM_SCAN_INTERVAL))
+               return connman_settings.wifi_roam_scan_interval;
+
        return 0;
 }
 #endif
@@ -1329,6 +1541,21 @@ int main(int argc, char *argv[])
 
        __connman_dbus_init(conn);
 
+#if defined TIZEN_EXT
+       if (access(CONTAINER_FILE, F_OK) == 0) {
+               g_main_loop_run(main_loop);
+
+               g_source_remove(signal);
+               dbus_connection_unref(conn);
+               g_main_loop_unref(main_loop);
+
+               __connman_dbus_cleanup();
+               __connman_log_cleanup(option_backtrace);
+
+               return 0;
+       }
+#endif
+
        if (!option_config)
                config_init(CONFIGMAINFILE);
        else
@@ -1360,7 +1587,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();
@@ -1451,6 +1682,7 @@ int main(int argc, char *argv[])
        g_strfreev(connman_settings.fallback_nameservers);
        g_strfreev(connman_settings.blacklisted_interfaces);
        g_strfreev(connman_settings.tethering_technologies);
+       g_free(connman_settings.vendor_class_id);
 
 #if defined TIZEN_EXT
        g_free(connman_ins_settings.ins_preferred_freq_bssid);