#define DEFAULT_INPUT_REQUEST_TIMEOUT (120 * 1000)
#define DEFAULT_BROWSER_LAUNCH_TIMEOUT (300 * 1000)
+#define DEFAULT_ONLINE_CHECK_IPV4_URL "http://ipv4.connman.net/online/status.html"
+#define DEFAULT_ONLINE_CHECK_IPV6_URL "http://ipv6.connman.net/online/status.html"
+
+/*
+ * 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"
bool enable_6to4;
char *vendor_class_id;
bool enable_online_check;
+ bool enable_online_to_ready_transition;
+ char *online_check_ipv4_url;
+ char *online_check_ipv6_url;
+ unsigned int online_check_initial_interval;
+ unsigned int online_check_max_interval;
bool auto_connect_roaming_services;
bool acd;
bool use_gateways_as_timeservers;
bool file_log;
bool dlog_log;
bool simple_log;
+ bool wifi_roam_scan;
+ bool wifi_roam;
+ int wifi_roam_min_snr;
+ int wifi_roam_min_rssi_2_4GHz;
+ int wifi_roam_min_rssi_5GHz;
+ int wifi_roam_min_rssi_6GHz;
+ int wifi_ap_selection_method;
#endif
} connman_settings = {
.bg_scan = true,
.enable_6to4 = false,
.vendor_class_id = NULL,
.enable_online_check = true,
+ .enable_online_to_ready_transition = false,
+ .online_check_ipv4_url = NULL,
+ .online_check_ipv6_url = NULL,
+ .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,
.file_log = true,
.dlog_log = true,
.simple_log = true,
+ .wifi_roam_scan = false,
+ .wifi_roam = false,
+ .wifi_roam_min_snr = 0,
+ .wifi_roam_min_rssi_2_4GHz = 0,
+ .wifi_roam_min_rssi_5GHz = 0,
+ .wifi_roam_min_rssi_6GHz = 0,
+ .wifi_ap_selection_method = AP_SELECTION_METHOD_NORMAL,
#endif
};
#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_IPV4_URL "OnlineCheckIPv4URL"
+#define CONF_ONLINE_CHECK_IPV6_URL "OnlineCheckIPv6URL"
+#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"
#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_CONNMAN_FILE_LOG "FileLogging"
-#define CONF_CONNMAN_DLOG_LOG "DlogLogging"
-#define CONF_CONNMAN_SIMPLIFIED_LOG "SimplifiedLog"
+#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 "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_ROAM_MIN_RSSI_6 "WifiRoamingMinRSSI_6GHz"
+#define CONF_WIFI_AP_SELECTION_METHOD "ApSelectionMethod"
#endif
#if defined TIZEN_EXT
#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,
CONF_ENABLE_6TO4,
CONF_VENDOR_CLASS_ID,
CONF_ENABLE_ONLINE_CHECK,
+ CONF_ENABLE_ONLINE_TO_READY_TRANSITION,
+ CONF_ONLINE_CHECK_IPV4_URL,
+ CONF_ONLINE_CHECK_IPV6_URL,
+ CONF_ONLINE_CHECK_INITIAL_INTERVAL,
+ CONF_ONLINE_CHECK_MAX_INTERVAL,
CONF_AUTO_CONNECT_ROAMING_SERVICES,
CONF_ACD,
CONF_USE_GATEWAYS_AS_TIMESERVERS,
CONF_TIZEN_TV_EXT,
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_SUPPLICANT_DEBUG,
+ CONF_WIFI_DEF_IFNAME,
+ CONF_FILE_LOG,
+ CONF_DLOG_LOG,
+ CONF_SIMPLIFIED_LOG,
+ CONF_WIFI_ROAM_SCAN,
+ CONF_WIFI_ROAM,
+ CONF_WIFI_ROAM_MIN_SNR,
+ CONF_WIFI_ROAM_MIN_RSSI_2_4,
+ CONF_WIFI_ROAM_MIN_RSSI_5,
+ CONF_WIFI_ROAM_MIN_RSSI_6,
+ CONF_WIFI_AP_SELECTION_METHOD,
#endif
NULL
};
CONF_INS_INTERNET_SCORE,
/* Common */
CONF_INS_SIGNAL_LEVEL3_5GHZ,
- CONF_INS_SIGNAL_LEVEL3_24GHZ,
+ CONF_INS_SIGNAL_LEVEL3_2_4GHZ,
NULL
};
#endif
}
#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;
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",
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);
boolean = __connman_config_get_bool(config, "General",
- CONF_CONNMAN_FILE_LOG, &error);
+ CONF_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);
+ CONF_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);
+ CONF_SIMPLIFIED_LOG, &error);
if (!error)
connman_settings.simple_log = boolean;
g_clear_error(&error);
- check_Tizen_INS_configuration(config);
+ boolean = __connman_config_get_bool(config, "General",
+ CONF_WIFI_ROAM_SCAN, &error);
+ if (!error)
+ connman_settings.wifi_roam_scan = boolean;
+
+ 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);
+
+ integer = g_key_file_get_integer(config, "General",
+ CONF_WIFI_ROAM_MIN_RSSI_6, &error);
+ if (!error)
+ connman_settings.wifi_roam_min_rssi_6GHz = integer;
+
+ g_clear_error(&error);
+
+ integer = g_key_file_get_integer(config, "General",
+ CONF_WIFI_AP_SELECTION_METHOD, &error);
+ if (!error)
+ connman_settings.wifi_ap_selection_method = integer;
+
+ g_clear_error(&error);
+
+ check_tizen_ins_configuration(config);
}
static void set_nofile_inc(void)
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 =
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",
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);
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);
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);
+
+ string = __connman_config_get_string(config, "General",
+ CONF_ONLINE_CHECK_IPV4_URL, &error);
+ if (!error)
+ connman_settings.online_check_ipv4_url = string;
+ else
+ connman_settings.online_check_ipv4_url =
+ g_strdup(DEFAULT_ONLINE_CHECK_IPV4_URL);
+
+ g_clear_error(&error);
+
+ string = __connman_config_get_string(config, "General",
+ CONF_ONLINE_CHECK_IPV6_URL, &error);
+ if (!error)
+ connman_settings.online_check_ipv6_url = string;
+ else
+ connman_settings.online_check_ipv6_url =
+ g_strdup(DEFAULT_ONLINE_CHECK_IPV6_URL);
+
+
+ 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;
g_clear_error(&error);
#if defined TIZEN_EXT
- check_Tizen_configuration(config);
+ check_tizen_configuration(config);
#endif
}
{ 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;
+ if (g_str_equal(key, CONF_ONLINE_CHECK_IPV4_URL))
+ return connman_settings.online_check_ipv4_url;
+
+ if (g_str_equal(key, CONF_ONLINE_CHECK_IPV6_URL))
+ return connman_settings.online_check_ipv6_url;
+
if (g_strcmp0(key, "wifi") == 0) {
if (!option_wifi)
return "nl80211,wext";
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;
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;
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;
- if (g_str_equal(key, CONF_CONNMAN_FILE_LOG))
+ if (g_str_equal(key, CONF_FILE_LOG))
return connman_settings.file_log;
- if (g_str_equal(key, CONF_CONNMAN_DLOG_LOG))
+ if (g_str_equal(key, CONF_DLOG_LOG))
return connman_settings.dlog_log;
- if (g_str_equal(key, CONF_CONNMAN_SIMPLIFIED_LOG))
+ if (g_str_equal(key, CONF_SIMPLIFIED_LOG))
return connman_settings.simple_log;
-#endif
-#if defined TIZEN_EXT
+ 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_INS_LAST_CONNECTED_BSSID))
return connman_ins_settings.ins_last_connected_bssid;
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;
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_WIFI_AP_SELECTION_METHOD))
+ return connman_settings.wifi_ap_selection_method;
+
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_MIN_RSSI_6))
+ return connman_settings.wifi_roam_min_rssi_6GHz;
+
return 0;
}
#endif
__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
__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();
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);
+ g_free(connman_settings.online_check_ipv4_url);
+ g_free(connman_settings.online_check_ipv6_url);
#if defined TIZEN_EXT
g_free(connman_ins_settings.ins_preferred_freq_bssid);
projects / platform / upstream / connman.git / blobdiff