WFD_CONF_CONFIG_METHOD,
WFD_CONF_NO_GROUP_IFACE,
WFD_CONF_GROUP_OPER_FREQ,
+ WFD_CONF_CONNECTION_TIMEOUT,
WFD_CONF_MAX,
};
(!g_strcmp0(conf_key_val[i].key, "listen_channel")) ||
(!g_strcmp0(conf_key_val[i].key, "operating_reg_class")) ||
(!g_strcmp0(conf_key_val[i].key, "operating_channel")) ||
- (!g_strcmp0(conf_key_val[i].key, "group_operating_freq"))) {
+ (!g_strcmp0(conf_key_val[i].key, "group_operating_freq")) ||
+ (!g_strcmp0(conf_key_val[i].key, "connection_timeout"))) {
conf_key_val[i].int_value = g_key_file_get_integer(result,
WFD_CONF_GROUP_NAME, conf_key_val[i].key, &error);
{WFD_CONF_CONFIG_METHOD, "config_methods", NULL, 0, FALSE},
{WFD_CONF_NO_GROUP_IFACE, "no_group_iface", NULL, 0, FALSE},
{WFD_CONF_GROUP_OPER_FREQ, "group_operating_freq", NULL, 0, FALSE},
+ {WFD_CONF_CONNECTION_TIMEOUT, "connection_timeout", NULL, 0, FALSE},
{WFD_CONF_MAX, NULL, NULL, 0, FALSE},
};
else
oem_conf->group_operating_freq = 0;
+ if (wfd_conf[WFD_CONF_CONNECTION_TIMEOUT].int_value > 0)
+ manager->connection_timeout = wfd_conf[WFD_CONF_CONNECTION_TIMEOUT].int_value;
+ else
+ manager->connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
+
__unload_wfd_config(key_file, wfd_conf);
__WDS_LOG_FUNC_EXIT__;//LCOV_EXCL_LINE
return;
}
-void _wfd_util_check_country_cb(keynode_t *key, void *data)
-{
- __WDS_LOG_FUNC_ENTER__;//LCOV_EXCL_LINE
- wfd_manager_s *manager = (wfd_manager_s*) data;
- int res = 0;
- int plmn = 0;
- char mcc[4] = {0, };
- char *ccode;
- GKeyFile *keyfile = NULL;
- const char *file_path = COUNTRY_CODE_FILE;
- GError *err = NULL;
-
- if (!manager) {
- WDS_LOGE("Invalid parameter");
- return;
- }
-
- res = vconf_get_int(VCONFKEY_TELEPHONY_PLMN, &plmn);
- if (res) {
- WDS_LOGE("Failed to get vconf value for PLMN(%d)", res);
- return;
- }
-
- snprintf(mcc, 4, "%d", plmn);
-
- keyfile = g_key_file_new();
- res = g_key_file_load_from_file(keyfile, file_path, 0, &err);
- if (!res) {
- WDS_LOGE("Failed to load key file(%s)", err->message);
- g_key_file_free(keyfile);
- g_error_free(err);
- return;
- }
-
- ccode = g_key_file_get_string(keyfile, "ccode_map", mcc, &err);
- if (!ccode) {
- WDS_LOGE("Failed to get country code string(%s)", err->message);
- g_key_file_free(keyfile);
- g_error_free(err);
- return;
- }
-
- res = wfd_oem_set_country(manager->oem_ops, ccode);
- if (res < 0)
- WDS_LOGE("Failed to set contry code");
- else
- WDS_LOGD("Succeeded to set country code(%s)", ccode);
-
- g_key_file_free(keyfile);
- g_free(ccode);
-
- __WDS_LOG_FUNC_EXIT__;//LCOV_EXCL_LINE
- return;
-}
-
int wfd_util_check_wifi_state()
{
__WDS_LOG_FUNC_ENTER__;//LCOV_EXCL_LINE
}
//LCOV_EXCL_STOP
-int wfd_util_set_country()
-{
- __WDS_LOG_FUNC_ENTER__;//LCOV_EXCL_LINE
- wfd_manager_s *manager = wfd_get_manager();
- int res = 0;
-
- _wfd_util_check_country_cb(NULL, manager);
-
- res = vconf_notify_key_changed(VCONFKEY_TELEPHONY_PLMN, _wfd_util_check_country_cb, manager);
- if (res) {
- WDS_LOGE("Failed to set vconf notification callback(TELEPHONY_PLMN)");
- return -1;
- }
-
- __WDS_LOG_FUNC_EXIT__;//LCOV_EXCL_LINE
- return 0;
-}
-
-int wfd_util_unset_country()
-{
- __WDS_LOG_FUNC_ENTER__;//LCOV_EXCL_LINE
- int res = 0;
-
- res = vconf_ignore_key_changed(VCONFKEY_TELEPHONY_PLMN, _wfd_util_check_country_cb);
- if (res) {
- WDS_LOGE("Failed to unset vconf notification callback(TELEPHONY_PLMN)");
- return -1;
- }
-
- __WDS_LOG_FUNC_EXIT__;//LCOV_EXCL_LINE
- return 0;
-}
static void __check_feature_supported(const char *key,
bool *feature_supported)